Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <[email protected]>
Thu, 22 Jan 2015 14:52:19 +0000 (09:52 -0500)
committerTom Rini <[email protected]>
Fri, 23 Jan 2015 01:04:05 +0000 (20:04 -0500)

Trivial merge